Fix problem where notebook gap was double shifted by allocation.x/y

Tue Nov 20 12:37:10 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
	where notebook gap was double shifted by allocation.x/y

	* gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
	to unmap children.

diff --git a/ChangeLog b/ChangeLog
index b32410d4c2ef1acab8def23337f302eb7dfe7530..6d543ac54ec421f31525d9d27ebc39a94b569a3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Nov 20 12:37:10 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
+       where notebook gap was double shifted by allocation.x/y
+
+       * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
+       to unmap children.
+
 Tue Nov 20 14:49:59 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b32410d4c2ef1acab8def23337f302eb7dfe7530..6d543ac54ec421f31525d9d27ebc39a94b569a3b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Tue Nov 20 12:37:10 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
+       where notebook gap was double shifted by allocation.x/y
+
+       * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
+       to unmap children.
+
 Tue Nov 20 14:49:59 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b32410d4c2ef1acab8def23337f302eb7dfe7530..6d543ac54ec421f31525d9d27ebc39a94b569a3b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Nov 20 12:37:10 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
+       where notebook gap was double shifted by allocation.x/y
+
+       * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
+       to unmap children.
+
 Tue Nov 20 14:49:59 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b32410d4c2ef1acab8def23337f302eb7dfe7530..6d543ac54ec421f31525d9d27ebc39a94b569a3b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Tue Nov 20 12:37:10 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
+       where notebook gap was double shifted by allocation.x/y
+
+       * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
+       to unmap children.
+
 Tue Nov 20 14:49:59 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b32410d4c2ef1acab8def23337f302eb7dfe7530..6d543ac54ec421f31525d9d27ebc39a94b569a3b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Nov 20 12:37:10 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
+       where notebook gap was double shifted by allocation.x/y
+
+       * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
+       to unmap children.
+
 Tue Nov 20 14:49:59 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b32410d4c2ef1acab8def23337f302eb7dfe7530..6d543ac54ec421f31525d9d27ebc39a94b569a3b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Nov 20 12:37:10 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
+       where notebook gap was double shifted by allocation.x/y
+
+       * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
+       to unmap children.
+
 Tue Nov 20 14:49:59 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b32410d4c2ef1acab8def23337f302eb7dfe7530..6d543ac54ec421f31525d9d27ebc39a94b569a3b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Nov 20 12:37:10 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
+       where notebook gap was double shifted by allocation.x/y
+
+       * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
+       to unmap children.
+
 Tue Nov 20 14:49:59 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 498a52856d330f1404d00673b8832fd848acb519..f9f08c211320afb61ef19dd06a9d31f6f7bfc0e2 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -834,6 +834,8 @@ gtk_notebook_unmap (GtkWidget *widget)
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 
   gdk_window_hide (GTK_NOTEBOOK (widget)->event_window);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
 }
 
 static void
@@ -2443,19 +2445,13 @@ gtk_notebook_paint (GtkWidget    *widget,
       switch (notebook->tab_pos)
        {
        case GTK_POS_TOP:
-         gap_x = (notebook->cur_page->allocation.x - border_width);
-         gap_width = notebook->cur_page->allocation.width;
-         break;
        case GTK_POS_BOTTOM:
-         gap_x = (notebook->cur_page->allocation.x - border_width);
+         gap_x = (notebook->cur_page->allocation.x - widget->allocation.x - border_width);
          gap_width = notebook->cur_page->allocation.width;
          break;
        case GTK_POS_LEFT:
-         gap_x = (notebook->cur_page->allocation.y - border_width);
-         gap_width = notebook->cur_page->allocation.height;
-         break;
        case GTK_POS_RIGHT:
-         gap_x = (notebook->cur_page->allocation.y - border_width);
+         gap_x = (notebook->cur_page->allocation.y - widget->allocation.y - border_width);
          gap_width = notebook->cur_page->allocation.height;
          break;
        }